Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 14 Sep 2010 03:37:07 +0000 (03:37 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 14 Sep 2010 03:37:07 +0000 (03:37 +0000)

Trivial merge